Default cargo publish to the alt registry if it's the only allowed one #8571

canova · 2020-07-31T13:19:29Z

Hi, this PR fixes #8036. Previously if we had only one allowed registry in Cargo.toml file, cargo publish was failing. But with this PR, we are defaulting to the only allowed registry with printing a note if there is only one registry in that array. I believe this will make things easier for people who use an alternative registry all the time.

rust-highfive · 2020-07-31T13:19:31Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Eh2406 (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

ehuss · 2020-08-05T20:48:41Z

Thanks for the PR! Would you mind updating the documentation to take note of the behavior? I would add a small note to the bottom of the section https://github.com/rust-lang/cargo/blob/master/src/doc/src/reference/manifest.md#the-publish-field. And also update the --registry flag documentation for the cargo publish man page. The man pages have recently been rearranged, so you'll need to rebase your PR to the lastest master. The source is in https://github.com/rust-lang/cargo/blob/master/src/doc/man/cargo-publish.md. I would remove {{> options-registry }} which loads a generic template for the --registry flag and add a custom definition, that might look something like this:

{{#option "`--registry` _registry_"}}
Name of the registry to publish to. Registry names are defined in [Cargo
config files](../reference/config.html). If not specified, and there is a
[`package.publish`](../reference/manifest.html#the-publish-field) field in
`Cargo.toml` with a single registry, then it will publish to that registry.
Otherwise it will use the default registry, which is defined by the
[`registry.default`](../reference/config.html#registry-default) config key
which defaults to `crates-io`.
{{/option}}

You can then run the build-man.sh script to rebuild the man pages.

canova · 2020-08-06T11:37:31Z

Thanks @ehuss, updated the code! Rebased on top of current master and added two more commits for the doc/man page update you mentioned. Could you take a look?

ehuss · 2020-08-06T17:48:51Z

Thanks!

@bors r+

bors · 2020-08-06T17:48:52Z

📌 Commit a8ce734 has been approved by ehuss

bors · 2020-08-06T17:49:01Z

⌛ Testing commit a8ce734 with merge 449743b...

bors · 2020-08-06T18:14:17Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 449743b to master...

Update cargo 7 commits in 1653f354644834073d6d2541e27fae94588e685e..ab32ee88dade1b50c77347599e82ca2de3fb8a51 2020-08-04 23:14:37 +0000 to 2020-08-10 17:44:43 +0000 - Build manpage archive deterministically (rust-lang/cargo#8600) - doc: Qualify GNU licenses in example license field (rust-lang/cargo#8604) - Fix jobserver_exists test on single-cpu systems (rust-lang/cargo#8598) - Fix small typo in reference/profiles.md (rust-lang/cargo#8605) - Default cargo publish to the alt registry if it's the only allowed one (rust-lang/cargo#8571) - cargo install with specific yanked version gives confusing "not found" error (rust-lang/cargo#8565) - Fix typo (rust-lang/cargo#8589)

Pkgsrc changes: * Remove patches now integrated upstream, many related to SunOS / Illumos. * The LLVM fix for powerpc is also now integrated upstream. * Adapt those patches where the source has moved or parts are integrated. * The randomness patches no longer applies, and I could not find where those files went... * Provide a separate bootstrap for NetBSD/powerpc 9.0, since apparently the C++ ABI is different from 8.0. Yes, this appears to be specific to the NetBSD powerpc ports. Upstream changes: Version 1.47.0 (2020-10-08) ========================== Language -------- - [Closures will now warn when not used.][74869] Compiler -------- - [Stabilized the `-C control-flow-guard` codegen option][73893], which enables [Control Flow Guard][1.47.0-cfg] for Windows platforms, and is ignored on other platforms. - [Upgraded to LLVM 11.][73526] - [Added tier 3\* support for the `thumbv4t-none-eabi` target.][74419] - [Upgrade the FreeBSD toolchain to version 11.4][75204] - [`RUST_BACKTRACE`'s output is now more compact.][75048] \* Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries --------- - [`CStr` now implements `Index<RangeFrom<usize>>`.][74021] - [Traits in `std`/`core` are now implemented for arrays of any length, not just those of length less than 33.][74060] - [`ops::RangeFull` and `ops::Range` now implement Default.][73197] - [`panic::Location` now implements `Copy`, `Clone`, `Eq`, `Hash`, `Ord`, `PartialEq`, and `PartialOrd`.][73583] Stabilized APIs --------------- - [`Ident::new_raw`] - [`Range::is_empty`] - [`RangeInclusive::is_empty`] - [`Result::as_deref`] - [`Result::as_deref_mut`] - [`Vec::leak`] - [`pointer::offset_from`] - [`f32::TAU`] - [`f64::TAU`] The following previously stable APIs have now been made const. - [The `new` method for all `NonZero` integers.][73858] - [The `checked_add`,`checked_sub`,`checked_mul`,`checked_neg`, `checked_shl`, `checked_shr`, `saturating_add`, `saturating_sub`, and `saturating_mul` methods for all integers.][73858] - [The `checked_abs`, `saturating_abs`, `saturating_neg`, and `signum` for all signed integers.][73858] - [The `is_ascii_alphabetic`, `is_ascii_uppercase`, `is_ascii_lowercase`, `is_ascii_alphanumeric`, `is_ascii_digit`, `is_ascii_hexdigit`, `is_ascii_punctuation`, `is_ascii_graphic`, `is_ascii_whitespace`, and `is_ascii_control` methods for `char` and `u8`.][73858] Cargo ----- - [`build-dependencies` are now built with opt-level 0 by default.][cargo/8500] You can override this by setting the following in your `Cargo.toml`. ```toml [profile.release.build-override] opt-level = 3 ``` - [`cargo-help` will now display man pages for commands rather just the `--help` text.][cargo/8456] - [`cargo-metadata` now emits a `test` field indicating if a target has tests enabled.][cargo/8478] - [`workspace.default-members` now respects `workspace.exclude`.][cargo/8485] - [`cargo-publish` will now use an alternative registry by default if it's the only registry specified in `package.publish`.][cargo/8571] Misc ---- - [Added a help button beside Rustdoc's searchbar that explains rustdoc's type based search.][75366] - [Added the Ayu theme to rustdoc.][71237] Compatibility Notes ------------------- - [Bumped the minimum supported Emscripten version to 1.39.20.][75716] - [Fixed a regression parsing `{} && false` in tail expressions.][74650] - [Added changes to how proc-macros are expanded in `macro_rules!` that should help to preserve more span information.][73084] These changes may cause compiliation errors if your macro was unhygenic or didn't correctly handle `Delimiter::None`. - [Moved support for the CloudABI target to tier 3.][75568] - [`linux-gnu` targets now require minimum kernel 2.6.32 and glibc 2.11.][74163] Internal Only -------- - [Improved default settings for bootstrapping in `x.py`.][73964] You can read details about this change in the ["Changes to `x.py` defaults"](https://blog.rust-lang.org/inside-rust/2020/08/30/changes-to-x-py-defaults.html) post on the Inside Rust blog. - [Added the `rustc-docs` component.][75560] This allows you to install and read the documentation for the compiler internal APIs. (Currently only available for `x86_64-unknown-linux-gnu`.) [1.47.0-cfg]: https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard [76980]: rust-lang/rust#76980 [75048]: rust-lang/rust#75048 [74163]: rust-lang/rust#74163 [71237]: rust-lang/rust#71237 [74869]: rust-lang/rust#74869 [73858]: rust-lang/rust#73858 [75716]: rust-lang/rust#75716 [75908]: rust-lang/rust#75908 [75516]: rust-lang/rust#75516 [75560]: rust-lang/rust#75560 [75568]: rust-lang/rust#75568 [75366]: rust-lang/rust#75366 [75204]: rust-lang/rust#75204 [74650]: rust-lang/rust#74650 [74419]: rust-lang/rust#74419 [73964]: rust-lang/rust#73964 [74021]: rust-lang/rust#74021 [74060]: rust-lang/rust#74060 [73893]: rust-lang/rust#73893 [73526]: rust-lang/rust#73526 [73583]: rust-lang/rust#73583 [73084]: rust-lang/rust#73084 [73197]: rust-lang/rust#73197 [72488]: rust-lang/rust#72488 [cargo/8456]: rust-lang/cargo#8456 [cargo/8478]: rust-lang/cargo#8478 [cargo/8485]: rust-lang/cargo#8485 [cargo/8500]: rust-lang/cargo#8500 [cargo/8571]: rust-lang/cargo#8571 [`Ident::new_raw`]: https://doc.rust-lang.org/nightly/proc_macro/struct.Ident.html#method.new_raw [`Range::is_empty`]: https://doc.rust-lang.org/nightly/std/ops/struct.Range.html#method.is_empty [`RangeInclusive::is_empty`]: https://doc.rust-lang.org/nightly/std/ops/struct.RangeInclusive.html#method.is_empty [`Result::as_deref_mut`]: https://doc.rust-lang.org/nightly/std/result/enum.Result.html#method.as_deref_mut [`Result::as_deref`]: https://doc.rust-lang.org/nightly/std/result/enum.Result.html#method.as_deref [`TypeId::of`]: https://doc.rust-lang.org/nightly/std/any/struct.TypeId.html#method.of [`Vec::leak`]: https://doc.rust-lang.org/nightly/std/vec/struct.Vec.html#method.leak [`f32::TAU`]: https://doc.rust-lang.org/nightly/std/f32/consts/constant.TAU.html [`f64::TAU`]: https://doc.rust-lang.org/nightly/std/f64/consts/constant.TAU.html [`pointer::offset_from`]: https://doc.rust-lang.org/nightly/std/primitive.pointer.html#method.offset_from

rust-highfive assigned Eh2406 Jul 31, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 31, 2020

ehuss self-assigned this Aug 5, 2020

canova added 5 commits August 6, 2020 13:01

Fix the comment of Package::publish

ae57964

Default cargo publish to the alt registry if it's the only allowed one

d0e86cb

Add a test case for new publish behavior change

32449a7

Update publish field doc to explain new cargo publish behavior

81ecfe9

Update man page of cargo publish to include the new behavior

a8ce734

canova force-pushed the publish-default branch from 0542bf0 to a8ce734 Compare August 6, 2020 11:34

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2020

bors merged commit 449743b into rust-lang:master Aug 6, 2020

canova deleted the publish-default branch August 6, 2020 18:27

ehuss mentioned this pull request Aug 11, 2020

Update cargo rust-lang/rust#75426

Merged

ehuss added this to the 1.47.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Default cargo publish to the alt registry if it's the only allowed one #8571

Default cargo publish to the alt registry if it's the only allowed one #8571

canova commented Jul 31, 2020

rust-highfive commented Jul 31, 2020

ehuss commented Aug 5, 2020

canova commented Aug 6, 2020

ehuss commented Aug 6, 2020

bors commented Aug 6, 2020

bors commented Aug 6, 2020

bors commented Aug 6, 2020

Default cargo publish to the alt registry if it's the only allowed one #8571

Default cargo publish to the alt registry if it's the only allowed one #8571

Conversation

canova commented Jul 31, 2020

rust-highfive commented Jul 31, 2020

ehuss commented Aug 5, 2020

canova commented Aug 6, 2020

ehuss commented Aug 6, 2020

bors commented Aug 6, 2020

bors commented Aug 6, 2020

bors commented Aug 6, 2020